Fix command lookup.