Project now compiles successfully against JDK7