Async bug fixes - still not working