Better handling of asyncronous channels