Fixes for PrimaryWeapon and Drone PriorityTarget handling...