KCINFR-979: code review fixes