Fix compile errors in utils due to units changes

Requires gh-1396.  Travis is expected to fail, but the breaking queue jobs should be happier.