Minor fixes for September

Not yet ready for merge.