Miscellaneous minor updates.