Small fixes

Some fixes.