UPGRADE: http with redirect fixes