Some fixes
Some fixes
Some upgrades