Fix VS2010 build and change defines to proper hex