Miscellaneous changes and updates