Small miscellaneous changes