Fixing bugs introduced by utility changes.