More miscellaneous updates.