Some sanitizer fixes

There's still leaks being generated by running the test suite but I haven't had time to look into them so I'm parking this branch for now.