Some minor cleanup pending next release.