PLA-1305 small fixes