diff --git a/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h b/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h
index 277cd4e6f8..cd1077a5e2 100644
--- a/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h
+++ b/arch/arm/src/stm32/chip/stm32f33xxx_vectors.h
@@ -102,7 +102,7 @@ VECTOR(stm32_usart3, STM32_IRQ_USART3)         /* 39: USART3 global or EXTI Line
 
 VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)     /* 40: EXTI Line[15:10] interrupts */
 VECTOR(stm32_rtcalrm, STM32_IRQ_RTCALRM)       /* 41: RTC alarm through EXTI line interrupt */
-UNUSED(STM32_IRQ_RESERVED42)                   /* 42: Reserved*/
+UNUSED(STM32_IRQ_RESERVED42)                   /* 42: Reserved */
 UNUSED(STM32_IRQ_RESERVED43)                   /* 43: Reserved */
 UNUSED(STM32_IRQ_RESERVED44)                   /* 44: Reserved */
 UNUSED(STM32_IRQ_RESERVED45)                   /* 45: Reserved */
@@ -113,7 +113,7 @@ UNUSED(STM32_IRQ_RESERVED49)                   /* 49: Reserved */
 
 UNUSED(STM32_IRQ_RESERVED50)                   /* 50: Reserved */
 UNUSED(STM32_IRQ_RESERVED51)                   /* 51: Reserved */
-UNUSED(STM32_IRQ_RESERVED51)                   /* 52: Reserved*/
+UNUSED(STM32_IRQ_RESERVED51)                   /* 52: Reserved */
 UNUSED(STM32_IRQ_RESERVED52)                   /* 53: Reserved */
 VECTOR(stm32_dac1, STM32_IRQ_DAC1)             /* 54: TIM6 global or DAC1 underrun interrupts */
 VECTOR(stm32_dac2, STM32_IRQ_DAC2)             /* 55: TIM7 global or DAC2 underrun interrupt */
diff --git a/sched/signal/sig_timedwait.c b/sched/signal/sig_timedwait.c
index dcbc892fd9..40cf8b55e6 100644
--- a/sched/signal/sig_timedwait.c
+++ b/sched/signal/sig_timedwait.c
@@ -171,9 +171,9 @@ static void sig_timeout(int argc, wdparm_t itcb)
  *                  empty message queue.
  *
  * Parameters:
- *   set - The pending signal set.
- *   info - The returned value
- *   timeout - The amount of time to wait
+ *   set     - The pending signal set.
+ *   info    - The returned value (may be NULL).
+ *   timeout - The amount of time to wait (may be NULL)
  *
  * Return Value:
  *   Signal number that cause the wait to be terminated, otherwise -1 (ERROR)
@@ -229,7 +229,7 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info,
 
       /* Return the signal info to the caller if so requested */
 
-      if (info)
+      if (info != NULL)
         {
           memcpy(info, &sigpend->info, sizeof(struct siginfo));
         }
@@ -254,7 +254,7 @@ int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *info,
 
       /* Check if we should wait for the timeout */
 
-      if (timeout)
+      if (timeout != NULL)
         {
           /* Convert the timespec to system clock ticks, making sure that
            * the resulting delay is greater than or equal to the requested