Export plugin, corrections