Various fixes and metrics update