Fix routing lookups