Fixed Sonar "Blocker Bugs"