Added a few more assertions