More asserts, fix bug I introduced