VS2012 fix + return 0 fix