Some important fixes
Some fixes