Fixes for metrics