various metrics fixes for reset_after_push feature