Fix issues building in VS 2013