Fixing provider issues & route issues.