Make all cubes work on preburn branch with current code