Sync up miscellaneous changes