Fixes for the Windows platform