Fixes on Windows