Fixed some redirect issues