Bug fixes and changes to the specification of metric sources.