Minor modifs.