PLA-795 small tweaks after code review