Fixes for attack arms