Fix some beta test failures within crv distributions