Improve openjdk7