A few minor modifs