Aurora fixes