PW-13549 fixes