Various fixes to builtins