lookup fixes