Fix for location and status bar bugs