Fixing some routing