Offline/export fixes