Fix for startup errors in Cloud Mode