extra/java7-openjdk fixes