More general changes to various files.