shooter: more fixes for 4.3