bugfixes for perofrmance metrics