Adapt for VS 2013

Change-Id: Icd7a3d0cbcb994986ea53a5fe91d3996b26cbe0c