Some fixes
Some other fixes