Fixed some issues with worker units and undo