Fix up some assertions