PLA-1539 code fixes after CR