Fix logic around utility targets.