Some fixes
Some fixes