Fixes for Windows...