Minor modifications to #5722

#5722 but with fixes to the class checksums.