Requested fixes to https://github.com/juju/charm/pull/4