changes to allow vs2012