extra changes for jdk-7