minor fixes in userland