Fixes, Windows support