PLA-1308: fixes after code review