Updates to support build under JDK7