Also updated these files to NanoJava 1.1.0