Bullet compile fixes