Minor fixes to sniper mode