Fix for API updates.