More fixes. (thanks Christophe)