Some fixes
Other fixes