diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp
index 178383749b..ac5c8ecefa 100644
--- a/interface/src/ui/overlays/ImageOverlay.cpp
+++ b/interface/src/ui/overlays/ImageOverlay.cpp
@@ -16,6 +16,7 @@
 #include "ImageOverlay.h"
 
 ImageOverlay::ImageOverlay() :
+    _manager(0),
     _textureID(0),
     _renderImage(false),
     _textureBound(false),
@@ -33,9 +34,9 @@ ImageOverlay::~ImageOverlay() {
 // TODO: handle setting image multiple times, how do we manage releasing the bound texture?
 void ImageOverlay::setImageURL(const QUrl& url) {
     // TODO: are we creating too many QNetworkAccessManager() when multiple calls to setImageURL are made?
-    QNetworkAccessManager* manager = new QNetworkAccessManager(this);
-    connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
-    manager->get(QNetworkRequest(url));
+    _manager = new QNetworkAccessManager();
+    connect(_manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
+    _manager->get(QNetworkRequest(url));
 }
 
 void ImageOverlay::replyFinished(QNetworkReply* reply) {
@@ -44,7 +45,7 @@ void ImageOverlay::replyFinished(QNetworkReply* reply) {
     QByteArray rawData = reply->readAll();
     _textureImage.loadFromData(rawData);
     _renderImage = true;
-    
+    _manager->deleteLater();
 }
 
 void ImageOverlay::render() {
diff --git a/interface/src/ui/overlays/ImageOverlay.h b/interface/src/ui/overlays/ImageOverlay.h
index 77cac3b3c6..d6165e388d 100644
--- a/interface/src/ui/overlays/ImageOverlay.h
+++ b/interface/src/ui/overlays/ImageOverlay.h
@@ -49,6 +49,8 @@ private:
 
     QUrl _imageURL;
     QImage _textureImage;
+    QNetworkAccessManager* _manager;
+
     GLuint _textureID;
     QRect _fromImage; // where from in the image to sample
     bool _renderImage; // is there an image associated with this overlay, or is it just a colored rectangle
diff --git a/interface/src/voxels/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp
index 5c68485436..bb907c8a9a 100644
--- a/interface/src/voxels/VoxelSystem.cpp
+++ b/interface/src/voxels/VoxelSystem.cpp
@@ -1508,7 +1508,9 @@ void VoxelSystem::killLocalVoxels() {
     PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), 
                             "VoxelSystem::killLocalVoxels()");
     _tree->lockForWrite();
+    VoxelSystem* voxelSystem = _tree->getRoot()->getVoxelSystem();
     _tree->eraseAllOctreeElements();
+    _tree->getRoot()->setVoxelSystem(voxelSystem);
     _tree->unlock();
     clearFreeBufferIndexes();
     if (_usePrimitiveRenderer) {