fixes and metrika