Fix small bugs.

Seb find some small bugs on master.