match up with lintify changes