Fixes for the forest save, shapeditor.