Minor miscellaneous changes