diff --git a/src/render.c b/src/render.c
index b915ab8..5a6648e 100644
--- a/src/render.c
+++ b/src/render.c
@@ -63,7 +63,7 @@ int render_stdin(context_t *cx)
             break;
 
         caca_set_canvas_size(cv, 0, 0);
-        caca_import_canvas_from_memory(cv, line, strlen(line), "utf8");
+        caca_import_memory(cv, line, strlen(line), "utf8");
         for(i = 0; i < caca_get_canvas_width(cv); i++)
         {
             uint32_t ch = caca_get_char(cv, i, 0);
@@ -106,7 +106,7 @@ int render_list(context_t *cx, int argc, char *argv[])
             len = strlen(parser);
 
         caca_set_canvas_size(cv, 0, 0);
-        caca_import_canvas_from_memory(cv, parser, len, "utf8");
+        caca_import_memory(cv, parser, len, "utf8");
         for(i = 0; i < caca_get_canvas_width(cv); i++)
         {
             uint32_t ch = caca_get_char(cv, i, 0);
@@ -156,7 +156,7 @@ static int render_flush(context_t *cx)
     filter_do(cx);
 
     /* Output line */
-    buffer = caca_export_canvas_to_memory(cx->torender, cx->export, &len);
+    buffer = caca_export_memory(cx->torender, cx->export, &len);
     if(!buffer)
         return -1;
     fwrite(buffer, len, 1, stdout);
diff --git a/tools/caca2tlf.c b/tools/caca2tlf.c
index 6a6266d..bbc11a6 100644
--- a/tools/caca2tlf.c
+++ b/tools/caca2tlf.c
@@ -170,7 +170,7 @@ static void list_fonts(void)
 static void add_char(unsigned long int ch)
 {
     void *buf;
-    unsigned long int len;
+    size_t len;
     unsigned int x, y, myw, mygw;
     int full = caca_utf32_is_fullwidth(ch);