Bugfix: Improved Windows Support