More redirect optimizations