Adding http hot fixes