Fixes for compat with juju-core
  James Page 2013-08-13 Fixes for compat with juju-core