Few changes to fix VS2013 issues