Finished off HTTP Fixes #6