Fixes for JDK 1.6 tests.