Updated redirect fixes