Add a few changes accumulated over a long time