Updates to address contrast errors