diff --git a/src/common/beaglequeuecache.cpp b/src/common/webstore.cpp
similarity index 100%
rename from src/common/beaglequeuecache.cpp
rename to src/common/webstore.cpp
diff --git a/src/common/beaglequeuecache.h b/src/common/webstore.h
similarity index 100%
rename from src/common/beaglequeuecache.h
rename to src/common/webstore.h
diff --git a/src/index/beaglequeue.cpp b/src/index/webqueue.cpp
similarity index 100%
rename from src/index/beaglequeue.cpp
rename to src/index/webqueue.cpp
diff --git a/src/index/beaglequeue.h b/src/index/webqueue.h
similarity index 100%
rename from src/index/beaglequeue.h
rename to src/index/webqueue.h
diff --git a/src/python/recoll/pyrclextract.cpp b/src/python/recoll/pyrclextract.cpp
index 5d8db839..6f0b3caa 100644
--- a/src/python/recoll/pyrclextract.cpp
+++ b/src/python/recoll/pyrclextract.cpp
@@ -210,8 +210,8 @@ Extractor_idoctofile(rclx_ExtractorObject* self, PyObject *args,
         return 0;
     }
     if (outfile.empty())
-	temp->setnoremove(1);
-    PyObject *result = outfile.empty() ? PyBytes_FromString(temp->filename()) :
+	temp.setnoremove(1);
+    PyObject *result = outfile.empty() ? PyBytes_FromString(temp.filename()) :
 	PyBytes_FromString(outfile.c_str());
     return (PyObject *)result;
 }