Fixes after SONAR analysis