Fix local lookups