Some fixes
One little fix