Various updates for IAP and tasks.