Fixes for offline deployments