Several redirect fixes