Changes for asynccore issues