Cleaning up the offline mode a little bit.