Add checks to allow user overriding inconsistencies