rebuild async fixes