Rollbar fixes