Fixes for August

Various fixes and additions for August.

Unfortunately, the commit did not come down as clean as I would like.