Some metric_fu improvements