fix stack computations for lmap
fix INST_LMAP_COLLECT from trunk