Fix buffering

Now the userspace CLI works (again)