Fix the utils up to build with the new API.
Merge branch 'master' of github.com:commtech/cfscc