Fixes for use under Windows.