Importer return statement, spec fixes