Fix up from a bunch of ubsan issues found.

Fix up from a bunch of ubsan issues found. #830