GUNFIELD: Hotfix

Fixing minor bugs.