fix more bugs in ListBuiltin code