Fixes for updates to ECF APIs