Fixes to autoscale operations
Merge pull request #363 from jamiehannaford/autoscale-fixes

Autoscale fixes