Windows 8 minor fixes