FindBugs(tm) recomendations applied.