Index: libc/generic/async.c
===================================================================
--- libc/generic/async.c	(revision 085bd54731b26cc239e79bff42bde24e87ebf930)
+++ libc/generic/async.c	(revision 63bb83ed7412a460e79d7f86131e182f7bdc3040)
@@ -540,5 +540,4 @@
 static int async_manager_thread(void *arg)
 {
-	in_interrupt_handler = 0; // TODO: Handle TLS better
 	futex_up(&async_futex); /* async_futex is always locked when entering
 				* manager */
Index: libc/generic/psthread.c
===================================================================
--- libc/generic/psthread.c	(revision 085bd54731b26cc239e79bff42bde24e87ebf930)
+++ libc/generic/psthread.c	(revision 63bb83ed7412a460e79d7f86131e182f7bdc3040)
@@ -53,5 +53,5 @@
 static int serialized_threads; /* Protected by async_futex */
 /** Thread-local count of serialization. If >0, we must not preempt */
-static __thread serialization_count;
+static __thread int serialization_count;
 /** Counter of threads residing in async_manager */
 static int threads_in_manager;
@@ -90,5 +90,4 @@
 	psthread_data_t *pt = __tcb_get()->pst_data;
 
-	serialization_count = 0; // TODO: WHY HERE?
 	pt->retval = pt->func(pt->arg);
 
Index: libc/generic/thread.c
===================================================================
--- libc/generic/thread.c	(revision 085bd54731b26cc239e79bff42bde24e87ebf930)
+++ libc/generic/thread.c	(revision 63bb83ed7412a460e79d7f86131e182f7bdc3040)
@@ -64,6 +64,5 @@
 	
 	memcpy(data, &_tdata_start, &_tdata_end - &_tdata_start);
-	memset(data + (&_tbss_start-&_tdata_start), &_tbss_end-&_tbss_start, 0);
-
+	memset(data + (&_tbss_start-&_tdata_start), 0, &_tbss_end-&_tbss_start);
 	return tcb;
 }