Fixed Pistol + Entity stuff