some fixes
customizing for metrics collection