Further assorted changes