Some fixes
Some other changes