A number of changes to fix tutorials for Windows.