More miscellaneous changes