Fixes to new aiming modes