diff --git a/Firmware/MotorControl/main.cpp b/Firmware/MotorControl/main.cpp
index b25da149..7ffeb5e3 100644
--- a/Firmware/MotorControl/main.cpp
+++ b/Firmware/MotorControl/main.cpp
@@ -97,7 +97,7 @@ void enter_dfu_mode() {
 
 extern "C" {
 int odrive_main(void);
-void vApplicationStackOverflowHook(void) {
+void vApplicationStackOverflowHook(xTaskHandle *pxTask, signed portCHAR *pcTaskName) {
     for (;;); // TODO: safe action
 }
 void vApplicationIdleHook(void) {
diff --git a/Firmware/communication/communication.cpp b/Firmware/communication/communication.cpp
index 7c08654a..79982e64 100644
--- a/Firmware/communication/communication.cpp
+++ b/Firmware/communication/communication.cpp
@@ -84,7 +84,7 @@ void init_communication(void) {
     printf("hi!\r\n");
 
     // Start command handling thread
-    osThreadDef(task_cmd_parse, communication_task, osPriorityNormal, 0, 6000 /* in 32-bit words */); // TODO: fix stack issues
+    osThreadDef(task_cmd_parse, communication_task, osPriorityNormal, 0, 8000 /* in 32-bit words */); // TODO: fix stack issues
     comm_thread = osThreadCreate(osThread(task_cmd_parse), NULL);
 
     while (!endpoint_list_valid)
diff --git a/Firmware/communication/interface_usb.cpp b/Firmware/communication/interface_usb.cpp
index cd44c907..036a8203 100644
--- a/Firmware/communication/interface_usb.cpp
+++ b/Firmware/communication/interface_usb.cpp
@@ -177,6 +177,6 @@ void usb_rx_process_packet(uint8_t *buf, uint32_t len, uint8_t endpoint_pair) {
 
 void start_usb_server() {
     // Start USB communication thread
-    osThreadDef(usb_server_thread_def, usb_server_thread, osPriorityNormal, 0, 512);
+    osThreadDef(usb_server_thread_def, usb_server_thread, osPriorityNormal, 0, 1024);
     usb_thread = osThreadCreate(osThread(usb_server_thread_def), NULL);
 }