KM-353 updates from code review