Fixing problems found in windows functionality