Fix completeness checks