Fix 64bit build error and some goto-catch

No match.