An attempt to fix windows issues I'm seeing