Some fixes

Some fixes.