Minor Windows changes.