Bug fixes to running away from cloud