Various Windows Fixes