Update build to work with jvm8