Return to java 7 because of eclipse problems
Further cleaning of findbugs warnings