Prep for metric namespaces changes.
Some small stuff lying around
Bump