Assertion improvements