CLI and example-http fixes