diff --git a/veejay-current/veejay-server/libplugger/frei0r-loader.c b/veejay-current/veejay-server/libplugger/frei0r-loader.c
index eeaa515e..0d6daaa2 100644
--- a/veejay-current/veejay-server/libplugger/frei0r-loader.c
+++ b/veejay-current/veejay-server/libplugger/frei0r-loader.c
@@ -569,6 +569,7 @@ void* 	deal_with_fr( void *handle, char *name)
 			veejay_msg(VEEJAY_MSG_ERROR, "Supposed to be mixer plugin (2 sources) but no f0r_update2");
 			(*f0r_deinit)();
 			vpf(port);
+			if(plug_name) free(plug_name);
 			return NULL;
 		}
 	} else if ( finfo.plugin_type == F0R_PLUGIN_TYPE_FILTER ) {
@@ -577,6 +578,7 @@ void* 	deal_with_fr( void *handle, char *name)
 			veejay_msg(VEEJAY_MSG_ERROR, "Supposed to be filter plugin (1 input source) but no f0r_update");
 			(*f0r_deinit)();
 			vpf(port);
+			if(plug_name) free(plug_name);
 			return NULL;
 		}
 	} else if ( finfo.plugin_type == F0R_PLUGIN_TYPE_SOURCE ) {
@@ -586,12 +588,14 @@ void* 	deal_with_fr( void *handle, char *name)
 			veejay_msg(VEEJAY_MSG_ERROR, "Supposed to be generator plugin (1 output source) but no f0r_update");
 			(*f0r_deinit)();
 			vpf(port);
+			if(plug_name) free(plug_name);
 			return NULL;
 		}
 	} else {
 		veejay_msg(VEEJAY_MSG_ERROR, "Frei0r plugin '%s' (%s) unsupported type", finfo.name, plugin_name );
 		(*f0r_deinit)();
 		vpf(port);
+		if(plug_name) free(plug_name);
 		return NULL;
 	}
 
diff --git a/veejay-current/veejay-server/veejay/vj-sdl-font.c b/veejay-current/veejay-server/veejay/vj-sdl-font.c
index 43c75d7a..350acd92 100644
--- a/veejay-current/veejay-server/veejay/vj-sdl-font.c
+++ b/veejay-current/veejay-server/veejay/vj-sdl-font.c
@@ -213,6 +213,12 @@ void	vj_sdl_font_free(void *font)
 				    free(f->q->history[i]);
 				f->q->history[i] = NULL;
 			}
+			if(f->q->history)
+				free(f->q->history);
+			if(f->q->width)
+				free(f->q->width);
+			if(f->q->height)
+				free(f->q->height);
 			free(f->q);
 		}
 		free(font);