Add a few more invariant checks