Fixed redirect issues