assertion mode fixes