More redirect fixes.

Google Analytics is seriously helpful on this.