one more deadlock, some asserts fixed