Minor bugs

Sometimes... Where is my head !
Seriously : changes from 0.8 to 2.0 weren't all done...