PLA-1487 code fixes