cloud: bunch of fixes