More invariants checks