Windows Fixes :(