Minor changes from the build for Vicon on Windows.