SUMO-12823 Code review fixes