Refinements on offline mode.