Changes to make the importer and webapp compatible.