More improvements in async handling

Signed-off-by: Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>