First batch of consistency checking