Fix wrapping to expose RigidFrame so that wrapping tests pass