Fix clang compilation

Please check the builtin renaming, I am not 100% sure of your test coverage