Fix usage of deprecated functions in builtin