Adding minor assertions
Assertion fix