Updates because of changes in cffreedom-utils