Port fixes for BlockingIOCometSupport