Merge: First pass at fixing cube issues.