Fix lingering issues with the http-mserv merge

Ok, that merge request was there for two months and no one caught it. I'm not owned, I'm not owned! I'm also done pushing to next for this, so if there's any other problems they go here...