Build fixes, manually merged status bar fix