PAAS-150 fixes

Please review and merge