Miscellaneous changes and improvements