Fix status bar issues