Fixed the last of the windows Bugs