Assorted changes...