Added a few small consistency checks