Miscellaneous changes

Miscellaneous changes.