PAAS-153 fixes