Fix assertion flow errors