Fix up some of the handling around the cube