Minor fixes for next release
v9.47 release - see release notes