Fix a few more assertions