Small fixes

Some fixes.
Ok let's look...