Dealing with non-conformities