Fix path lookups