Some SIGIO-removal fixes