VS2012 Update 3 Fixes

See #459 and #461 

A simple change, but I'm concerned about what this might break.

I'll revisit it after I've reviewed some of the other outstanding PRs.