More data integrity checks