Fixed issues relative to sonar Rules Of Compliance