Updates for new quickcheck