A few minor changes