Name lookups fixed partially