Updated to deal with new userland