few more asserts + metric fixes