diff --git a/editor/extensions/ext-imagelib.js b/editor/extensions/ext-imagelib.js
index 3d241626..6abf9ea8 100644
--- a/editor/extensions/ext-imagelib.js
+++ b/editor/extensions/ext-imagelib.js
@@ -131,7 +131,7 @@ svgEditor.addExtension("imagelib", function() {
 				if(response.indexOf('data:image/svg+xml') === 0) {
 					var pre = 'data:image/svg+xml;base64,';
 					var src = response.substring(pre.length);
-					response = svgCanvas.Utils.decode64(src);
+					response = svgedit.utilities.decode64(src);
 					svg_str = true;
 					break;
 				} else if(response.indexOf('data:image/') === 0) {
@@ -141,7 +141,7 @@ svgEditor.addExtension("imagelib", function() {
 				// Else fall through
 			default:
 				// TODO: See if there's a way to base64 encode the binary data stream
-// 				var str = 'data:;base64,' + svgCanvas.Utils.encode64(response, true);
+// 				var str = 'data:;base64,' + svgedit.utilities.encode64(response, true);
 			
 				// Assume it's raw image data
 // 				importImage(str);
diff --git a/editor/extensions/ext-server_opensave.js b/editor/extensions/ext-server_opensave.js
index 0c492c1a..0c67934a 100644
--- a/editor/extensions/ext-server_opensave.js
+++ b/editor/extensions/ext-server_opensave.js
@@ -38,7 +38,7 @@ svgEditor.addExtension("server_opensave", {
                     filename = getFileNameFromTitle();
 
                 //if (clientDownloadSupport(filename, '.svg', 'data:image/svg+xml,' + encodeURI(data))) { // Firefox limits size of file
-                if (clientDownloadSupport(filename, '.svg', 'data:image/svg+xml;base64,' + window.btoa(data))) {
+                if (clientDownloadSupport(filename, '.svg', 'data:image/svg+xml;base64,' + svgedit.utilities.encode64(data))) {
                     return;
                 }
 				
@@ -119,9 +119,9 @@ svgEditor.addExtension("server_opensave", {
 			}
 		
 			$('#dialog_box').hide();
-		
+
 			if (type !== 'import_img') {
-				xmlstr = svgCanvas.Utils.decode64(str64);
+				xmlstr = svgedit.utilities.decode64(str64);
 			}
 			
 			switch (type) {