Fix up VS2012 build.