Fixing Visual Studio compilation (works with VS2013) - note that FMA3 tests fail for now