Minor changes (still a lot of compile error, some are due to VC compiler
bugs)