Fixes to compile on JDK, not just ECJ