Add a few minor changes