Added more EINTR handlers