Lookup fixes