Fix eclipse/sonar warnings in models