Additional fixes encountered during v2023dev1 release branching - T8136

Additional broken down fixes encountered during the v2022 and v2023dev1 release cycle

Signed-off-by: Ritesh Raj Sarraf ritesh.sarraf@collabora.com