Minor updates from Microsoft repository, mostly to make things compile with a C compiler.