Fixing some redirect issues