Merge "more ioctl work"