Cloud Ops Fixes

Still not perfect