Fixes for the failing release note tests.