changes for openjdk build