Somes corrections

Tested agains eliot : http://www.nongnu.org/eliot
Still one little problem to resolve...