User space

Small fixes