Add a few minor changes/improvements/fixings.