Fixes for QuickCheck 2.7