Cuboid and Cylinder bug fixes.