Add AzureSets and small ohshi help fix