Added changes for Windows 8 build