Some fixes
Some small fixes