[PLT-293] minor tweaks