Fix routing bugs
Fix routing bugs