Almost final clang fixes