[WIP][Http] Fixes