// minor fixes in l calls