diff --git a/Makefile b/Makefile
index 8586e46..6360441 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all: firecgi.a firecgi.o firecgi.so example_simple
 objects = server.o connection.o request.o parse.o
 
 firebuf/firebuf.o:
-	$(MAKE) --directory=firebuf
+	$(MAKE) --directory=firebuf firebuf.o
 
 firecgi.a: $(objects)
 	ar rcs $@ $^
@@ -31,7 +31,7 @@ clean:
 
 afl:
 	$(MAKE) clean
-	FIRE_CXX=afl-g++ $(MAKE) afl_int
+	FIRE_CXX=afl-g++ FIRE_CXXFLAGS="-O3 -std=gnu++2a -fPIC -fPIE" $(MAKE) afl_int
 
 afl_int: connection_afl
 
diff --git a/connection_afl.cc b/connection_afl.cc
index 791ede3..209b5f5 100644
--- a/connection_afl.cc
+++ b/connection_afl.cc
@@ -7,7 +7,7 @@ int main(int argc, char* argv[]) {
 	gflags::ParseCommandLineFlags(&argc, &argv, true);
 
 	{
-		firecgi::Connection conn(STDIN_FILENO, {}, [](std::unique_ptr<firecgi::Request> req) { req->End(); }, {});
+		firecgi::Connection conn(STDIN_FILENO, {}, [](firecgi::Request* req) { req->End(); }, {}, 16*1024);
 		static_cast<void>(conn.Read());
 	}