Update some Fix for supporting VS2013 compilation!