Various little fixes to offline mode support