Fix lookup definitions