Fixing some sonar stuff and fixing eclipse issue