Fix bugs for nslcm