Assorted changes.