Some small Windows Tweaks to make this behave.