Missed changes
Merge branch 'master' of https://github.com/jordonsc/cloud-ctrl
Small fixes for recent refactoring