Beast clang fixes