Handle some Sonar complains