Fixed several issues with async process flow