PAAS-153 fixes

Please review and merge