Apply a couple of accumulated changes that didn't make it over from the offline version.