fixes for oracle openjdk