diff --git a/payloads/libpayload/drivers/serial/8250.c b/payloads/libpayload/drivers/serial/8250.c
index 1df34c41ea..f3d98a9b79 100644
--- a/payloads/libpayload/drivers/serial/8250.c
+++ b/payloads/libpayload/drivers/serial/8250.c
@@ -72,9 +72,9 @@ static void serial_write_reg(uint8_t val, int offset)
 static void serial_hardware_init(int speed, int word_bits,
 				 int parity, int stop_bits)
 {
+#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
 	unsigned char reg;
 
-#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
 	/* Disable interrupts. */
 	serial_write_reg(0, 0x01);
 
diff --git a/payloads/libpayload/drivers/udc/dwc2.c b/payloads/libpayload/drivers/udc/dwc2.c
index 65413085da..6c72fbae43 100644
--- a/payloads/libpayload/drivers/udc/dwc2.c
+++ b/payloads/libpayload/drivers/udc/dwc2.c
@@ -502,7 +502,7 @@ static void complete_ep_transfer(struct usbdev_ctrl *this, int endpoint,
 	}
 	SIMPLEQ_REMOVE_HEAD(&p->eps[endpoint][in_dir].job_queue, queue);
 
-	usb_debug("%d-%d: scheduled %zd, now %d bytes\n", endpoint, in_dir,
+	usb_debug("%d-%d: scheduled %zd, now %zd bytes\n", endpoint, in_dir,
 	      job->length, job->xfered_length);
 
 	if (this->current_config &&