diff --git a/GNUmakefile b/GNUmakefile
index 8a92f39..c7603bb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -107,8 +107,10 @@ $(SOCKET_OBJS) $(BUFFER_OBJS) $(MMAP_OBJS) $(TEXTCODE_OBJS) \
 $(TAIA_OBJS) $(TAI_OBJS) $(CASE_OBJS) $(ARRAY_OBJS) $(MULT_OBJS) \
 $(IO_OBJS)
 
+CFLAGS+=-I.
+
 %.o: %.c
-	$(DIET) $(CC) -c $< -o $@ -I. $(CFLAGS)
+	$(DIET) $(CC) -c $< $(CFLAGS)
 
 %.a:
 	ar cr $@ $^
@@ -117,7 +119,7 @@ $(IO_OBJS)
 t.o: iopause.h
 
 t: t.o libowfat.a
-	$(DIET) $(CC) -g -o $@ $^
+	$(DIET) $(CC) -g -o $@ t.o libowfat.a
 
 .PHONY: all clean tar install rename
 clean:
diff --git a/array/array_cats.c b/array/array_cats.c
index d47c7c8..bcb2cd7 100644
--- a/array/array_cats.c
+++ b/array/array_cats.c
@@ -2,5 +2,5 @@
 #include "str.h"
 
 void array_cats(array* to,const char* from) {
-  array_catb(to,from,strlen(from));
+  array_catb(to,from,str_len(from));
 }
diff --git a/array/array_cats0.c b/array/array_cats0.c
index 84c5a30..6981afb 100644
--- a/array/array_cats0.c
+++ b/array/array_cats0.c
@@ -2,5 +2,5 @@
 #include "str.h"
 
 void array_cats0(array* to,const char* from) {
-  array_catb(to,from,strlen(from)+1);
+  array_catb(to,from,str_len(from)+1);
 }