diff --git a/libticalcs/trunk/src/calc_nsp.cc b/libticalcs/trunk/src/calc_nsp.cc
index 247a70e3..77720081 100644
--- a/libticalcs/trunk/src/calc_nsp.cc
+++ b/libticalcs/trunk/src/calc_nsp.cc
@@ -370,7 +370,7 @@ static int enumerate_folder(CalcHandle* handle, GNode** vars, const char * folde
 			// We might have to remove some extensions.
 			if (fe->type == NSP_TNS)
 			{
-				char * ext = tifiles_fext_get(varname);
+				char * ext = (char*)tifiles_fext_get((const char*)varname);
 				// Just a sanity check
 				if (ext)
 				{
diff --git a/libticalcs/trunk/src/calc_xx.cc b/libticalcs/trunk/src/calc_xx.cc
index df199986..808c1f4d 100644
--- a/libticalcs/trunk/src/calc_xx.cc
+++ b/libticalcs/trunk/src/calc_xx.cc
@@ -2096,9 +2096,7 @@ int TICALL ticalcs_calc_recv_cert2(CalcHandle* handle, const char* filename)
 				break;
 			}
 
-			gchar* e = tifiles_fext_get(basename);
-
-			memcpy(e, "crt", 3);
+			memcpy((void*)tifiles_fext_get(basename), "crt", 3);
 
 			content = tifiles_content_create_flash(handle->model);
 			ret = ticalcs_calc_recv_cert(handle, content);