Some fixes lc
Some minor fixes