Fixed other redirect issues