Add some 5.6.2 workarounds
Microsoft compiler workarounds