Add miscellaneous changes