Tweaks based on Windows work