Bullet fixes