More fixes to :element -> :req
Change default invariant check