More sonar violation fixes - RC now at 95% which references #126