Better support for offline-mode uuids