Fixing windows issues... hopefully...