Fixes for Windows 8.1

Wiring build fixes to run on Windows 8.1