PLF-5886 fix some small bugs