Various bot/weapon fixes