diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 698479d4212..9d216f029f9 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -241,11 +241,11 @@ struct mm_heap_s
 
   sem_t mm_semaphore;
   pid_t mm_holder;
-  int   mm_counts_held;
+  int mm_counts_held;
 
   /* This is the size of the heap provided to mm */
 
-  size_t  mm_heapsize;
+  size_t mm_heapsize;
 
   /* This is the first and last nodes of the heap */
 
diff --git a/sched/task/task_getpid.c b/sched/task/task_getpid.c
index fcd10e10310..1e47abaa486 100644
--- a/sched/task/task_getpid.c
+++ b/sched/task/task_getpid.c
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <sched.h>
+#include <errno.h>
 
 #include "sched/sched.h"
 #include "task/task.h"
@@ -66,7 +67,7 @@
  *   getpid(), however, may be called from within the OS in some cases.
  *   There are certain situations during context switching when the OS data
  *   structures are in flux and where the current task at the head of the
- *   ready-to-run task list) is not actually running.  In that case,
+ *   ready-to-run task list is not actually running.  In that case,
  *   getpid() will return the error: -ESRCH
  *
  ****************************************************************************/
@@ -80,7 +81,7 @@ pid_t getpid(void)
    * exceptions to this:
    *
    * 1. Early in the start-up sequence, the ready-to-run list may be
-   *    empty!  This case, of course, the CPU0 start-up/IDLE thread with
+   *    empty!  In this case, of course, the CPU0 start-up/IDLE thread with
    *    pid == 0 must be running, and
    * 2. As described above, during certain context-switching conditions the
    *    task at the head of the ready-to-run list may not actually be