Minor consistency checks