Miscellaneous changes

Miscellaneous changes