KHRES-265 #comment small fixes based on the code review in Crucible