fixes for jdk 1.7