some fixes
Some fixes