Make some tweaks to accommodate Windows.