assert fixes