Java 7 warnings removed