Fixes for async response to SO