diff --git a/core/mbox.c b/core/mbox.c
index bd5e32415a..1c2f7f78a4 100644
--- a/core/mbox.c
+++ b/core/mbox.c
@@ -59,7 +59,7 @@ int _mbox_put(mbox_t *mbox, msg_t *msg, int blocking)
 {
     unsigned irqstate = irq_disable();
 
-    list_node_t *next = (list_node_t*) list_remove_head(&mbox->readers);
+    list_node_t *next = list_remove_head(&mbox->readers);
     if (next) {
         DEBUG("mbox: Thread %"PRIkernel_pid" mbox 0x%08x: _tryput(): "
                 "there's a waiter.\n", sched_active_pid, (unsigned)mbox);
@@ -99,7 +99,7 @@ int _mbox_get(mbox_t *mbox, msg_t *msg, int blocking)
                 "got queued message.\n", sched_active_pid, (unsigned)mbox);
         /* copy msg from queue */
         *msg = mbox->msg_array[cib_get_unsafe(&mbox->cib)];
-        list_node_t *next = (list_node_t*) list_remove_head(&mbox->writers);
+        list_node_t *next = list_remove_head(&mbox->writers);
         if (next) {
             thread_t *thread = container_of((clist_node_t*)next, thread_t, rq_entry);
             _wake_waiter(thread, irqstate);
diff --git a/core/msg.c b/core/msg.c
index 2cef88571a..a46875f16e 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -406,7 +406,7 @@ void msg_queue_print(void)
 
     printf("Message queue of thread %" PRIkernel_pid "\n", thread->pid);
     printf("    size: %u (avail: %d)\n", msg_queue->mask + 1,
-           cib_avail((cib_t *)msg_queue));
+           cib_avail(msg_queue));
 
     for (; i != (msg_queue->write_count & msg_queue->mask);
          i = (i + 1) & msg_queue->mask) {