More redirect fixes