fixes async and builds