Removing warnings found by findbug and (!!) m2e