Fixing issues for VS 2013