diff --git a/base.mk b/base.mk
index 2547119..6d99611 100644
--- a/base.mk
+++ b/base.mk
@@ -103,7 +103,7 @@ endef
 	$(AS) $(AARCH) $(AFLAGS) $(DEBUG) $< -o $@
 
 %.o: %.c
-	$(CC) $(CARCH) $(CFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@
+	$(CC) $(CARCH) $(CFLAGS) -std=c23 $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@
 
 %.o: %.cpp
 	$(CXX) $(CARCH) $(CFLAGS) $(CXXFLAGS) $(OPT) $(DEBUG) $(DEPFLAGS) -MF ${<}.d -c $< -o $@
diff --git a/example/maple_device_request.cpp b/example/maple_device_request.cpp
index 3c4307a..dab35ad 100644
--- a/example/maple_device_request.cpp
+++ b/example/maple_device_request.cpp
@@ -15,7 +15,7 @@ void main()
   using command_type = maple::device_request;
   using response_type = maple::device_status;
 
-  auto writer = maple::host_command_writer<>(send_buf, recv_buf);
+  auto writer = maple::host_command_writer(send_buf, recv_buf);
 
   auto [host_command, host_response]
     = writer.append_command_all_ports<command_type, response_type>();
diff --git a/maple/maple_host_command_writer.hpp b/maple/maple_host_command_writer.hpp
index a14cba3..97ae650 100644
--- a/maple/maple_host_command_writer.hpp
+++ b/maple/maple_host_command_writer.hpp
@@ -70,12 +70,12 @@ struct host_command_writer {
   template <typename C, typename R>
   constexpr inline std::tuple<maple::host_command<typename C::data_fields> *,
 			      maple::host_response<typename R::data_fields> *>
-  append_command_all_ports()
+  append_command_all_ports(bool set_end_flag = true)
   {
     auto ret = append_command<C, R>(host_instruction::port_select::a, ap::de::device | ap::port_select::a, false);
     append_command<C, R>(host_instruction::port_select::b, ap::de::device | ap::port_select::b, false);
     append_command<C, R>(host_instruction::port_select::c, ap::de::device | ap::port_select::c, false);
-    append_command<C, R>(host_instruction::port_select::d, ap::de::device | ap::port_select::d, true);
+    append_command<C, R>(host_instruction::port_select::d, ap::de::device | ap::port_select::d, set_end_flag);
     return ret;
   }