Windows bugfixing