Fixes for Microsoft Windows