Some additional comm count improvements from licm update