Updated things so they compile within VS 2012.