Page redirect fixes