minor style fixes backport 3.5