Fixes to built-in method implementation