Couple of minor bugfixes
Merge branch 'cloud_management_refactor'