Fix lookup methods