more LIMM fixes (nw)