Fixes for Add-AzureEnvironment