Comps change for OpenJDK 8