Bugfixes for VA, evaluation metrics