fixes on metrics