diff --git a/src/attribute/attribute.h b/src/attribute/attribute.h
index 6a3e34a75a..049582ed59 100644
--- a/src/attribute/attribute.h
+++ b/src/attribute/attribute.h
@@ -31,7 +31,7 @@
 enum lam_consts{
     LAM_PREDEFINED = 1,
     MPI_ERROR, 
-    MPI_INVALID_ATTR_KEYVAL,
+    MPI_INVALID_ATTR_KEYVAL
 };
 
 /* *******************************************************************  */
diff --git a/src/errhandler/errhandler.c b/src/errhandler/errhandler.c
index c0828e9811..19ff692227 100644
--- a/src/errhandler/errhandler.c
+++ b/src/errhandler/errhandler.c
@@ -155,7 +155,7 @@ int lam_errhandler_finalize(void)
   /* All done */
 
   return LAM_SUCCESS;
-};
+}
 
 
 lam_errhandler_t *lam_errhandler_create(lam_errhandler_type_t object_type,
diff --git a/src/event/event.c b/src/event/event.c
index bacfd9d58c..3d0035e19d 100644
--- a/src/event/event.c
+++ b/src/event/event.c
@@ -124,6 +124,7 @@ static int  lam_timeout_next(struct timeval *tv);
 static void lam_timeout_correct(struct timeval *off);
 static void lam_timeout_process(void);
 static void lam_timeout_insert(struct lam_event *);
+int lam_event_haveevents(void);
 
 static RB_HEAD(lam_event_tree, lam_event) lam_timetree;
 static struct lam_event_list lam_activequeue;
@@ -143,9 +144,9 @@ compare(struct lam_event *a, struct lam_event *b)
     return (0);
 }
 
-static RB_PROTOTYPE(lam_event_tree, lam_event, ev_timeout_node, compare);
+static RB_PROTOTYPE(lam_event_tree, lam_event, ev_timeout_node, compare)
 
-static RB_GENERATE(lam_event_tree, lam_event, ev_timeout_node, compare);
+static RB_GENERATE(lam_event_tree, lam_event, ev_timeout_node, compare)
 
 /* run loop for dispatch thread */
 static void* lam_event_run(lam_object_t* arg)
diff --git a/src/event/signal.c b/src/event/signal.c
index e2a65e918a..662d2bcbe4 100644
--- a/src/event/signal.c
+++ b/src/event/signal.c
@@ -59,6 +59,8 @@ static short lam_evsigcaught[NSIG];
 static int lam_needrecalc;
 volatile sig_atomic_t lam_evsignal_caught = 0;
 
+void lam_evsignal_handler(int sig);
+
 void
 lam_evsignal_init(sigset_t *evsigmask)
 {
diff --git a/src/group/mpi_group_init.c b/src/group/mpi_group_init.c
index 55c8a1d737..4179eea87a 100644
--- a/src/group/mpi_group_init.c
+++ b/src/group/mpi_group_init.c
@@ -191,4 +191,4 @@ int lam_group_finalize(void){
 
     /* return */
     return return_value;
-};
+}
diff --git a/src/mca/oob/cofs/src/oob_cofs.c b/src/mca/oob/cofs/src/oob_cofs.c
index 3e4873979b..0a71429adb 100644
--- a/src/mca/oob/cofs/src/oob_cofs.c
+++ b/src/mca/oob/cofs/src/oob_cofs.c
@@ -123,7 +123,7 @@ find_match(lam_job_handle_t job_handle, int vpid, int* tag)
   while ((ent = readdir(dir)) != NULL) {
     if (ent->d_name[0] == '.') continue;
 
-    ret = sscanf(ent->d_name, "%[^_]_%d_%d_%d_%lld.msg", tmp_handle, &tmp_vpid, 
+    ret = sscanf(ent->d_name, "%[^_]_%d_%d_%d_%llu.msg", tmp_handle, &tmp_vpid, 
                  &tmp_myvpid, &tmp_tag, &tmp_serial);
     if (ret != 5) {
       continue;
diff --git a/src/mca/ptl/base/ptl_base_recvreq.h b/src/mca/ptl/base/ptl_base_recvreq.h
index 2e197bbf70..9a2904c074 100644
--- a/src/mca/ptl/base/ptl_base_recvreq.h
+++ b/src/mca/ptl/base/ptl_base_recvreq.h
@@ -8,7 +8,7 @@
 #include "mca/ptl/ptl.h"
 #include "mca/pml/base/pml_base_request.h"
 
-extern lam_class_t mca_ptl_base_recv_request_t_class;;
+extern lam_class_t mca_ptl_base_recv_request_t_class;
 struct mca_ptl_base_recv_frag_t;
 
 
diff --git a/src/mca/ptl/tcp/src/ptl_tcp_proc.c b/src/mca/ptl/tcp/src/ptl_tcp_proc.c
index df8e324124..1b448dc2ce 100644
--- a/src/mca/ptl/tcp/src/ptl_tcp_proc.c
+++ b/src/mca/ptl/tcp/src/ptl_tcp_proc.c
@@ -81,7 +81,7 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_create(lam_proc_t* lam_proc)
         return 0;
     }
     memcpy(ptl_proc->proc_guid, lam_proc->proc_job, size);
-    memcpy(ptl_proc->proc_guid+size, &vpid, sizeof(uint32_t));
+    memcpy(((char*) ptl_proc->proc_guid) + size, &vpid, sizeof(uint32_t));
 
     /* lookup tcp parameters exported by this proc */
     rc = mca_base_modex_recv(
diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c
index a00fcea80a..2cc8f17318 100644
--- a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c
+++ b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c
@@ -85,7 +85,7 @@ void mca_ptl_tcp_send_frag_init(
     /* fragment state */
     sendfrag->frag_owner = &ptl_peer->peer_ptl->super;
     sendfrag->super.frag_request = sendreq;
-    sendfrag->super.super.frag_addr = sendreq->super.req_addr + hdr->hdr_frag.hdr_frag_offset;
+    sendfrag->super.super.frag_addr = ((char*) sendreq->super.req_addr) + hdr->hdr_frag.hdr_frag_offset;
     sendfrag->super.super.frag_size = size;
 
     sendfrag->frag_peer = ptl_peer;