Fix builtins and use of builtins in lib