Minor code updates to Windows