Windows 8 fixes