Http changes

There's me thinking I can just keep adding to my PR, and you've pulled it already!

Anyway, here's a couple more changes for the last lot of Http classes work.