Move back to java-1.6, occasional API updates