Rocketbar fixes