Make a few minor changes