Bugfixes: fix bugs in new metric implementations