Bullet related fixes