Fixes: ExportUnit-State not persisted; cosmetics