Fixing the build on OSX with JDK 1.7