Attempt to fix windows issues