Index: uspace/libc/generic/as.c
===================================================================
--- uspace/libc/generic/as.c	(revision 2def78824559e9a326693314a605af8e1e7e690a)
+++ uspace/libc/generic/as.c	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -37,4 +37,10 @@
 #include <unistd.h>
 #include <align.h>
+#include <types.h>
+
+/**
+ * Either 4*256M on 32-bit architecures or 16*256M on 64-bit architectures.
+ */
+#define MAX_HEAP_SIZE	(sizeof(uintptr_t)<<28)
 
 /** Create address space area.
@@ -142,5 +148,5 @@
 	/* Set heapsize to some meaningful value */
 	if (maxheapsize == -1)
-		set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH >> 1, PAGE_SIZE));
+		set_maxheapsize(MAX_HEAP_SIZE);
 	
 	if (!last_allocated)
Index: uspace/libc/generic/psthread.c
===================================================================
--- uspace/libc/generic/psthread.c	(revision 2def78824559e9a326693314a605af8e1e7e690a)
+++ uspace/libc/generic/psthread.c	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -62,5 +62,5 @@
 static int threads_in_manager;
 
-/** Setup PSthread information into TCB structure */
+/** Setup psthread information into TCB structure */
 psthread_data_t * psthread_setup()
 {
@@ -90,5 +90,5 @@
 }
 
-/** Function that is called on entry to new uspace thread */
+/** Function that is called on entry to new pseudo thread */
 void psthread_main(void)
 {
@@ -210,6 +210,5 @@
 }
 
-/**
- * Create a userspace thread
+/** Create a userspace pseudo thread.
  *
  * @param func Pseudo thread function.