Fix CI_URI:: not being properly indexed
Fix 2 Router-related errors