Assertion and fixes