Fixes for Windows