Some quality fix with new sonar ruleset