Various CHECK cleanup