Fix build under JDK8