Assorted changes to default configuration