Fixing some routing stuff