Fix section & Path lookups