Fix new API requirements.