Merge "Fix Sonar bugs"