Added a couple more assertions