A few more VS2012 fixes. Refs #6527