A few minor changes...