Fixes for broken aiming