up to bd55408, clang fixes