more consistency check fixes