Make 4.1 checks consistent across the library