Usermode fixes