US77540 Small code review fixes