Ranged combat prerequisites + bugfixes