Minor compatibility fixes for Confluence 9.5

Fixed in this release:

Minor compatibility fixes for Confluence 9.5.