Build & CI fixes

[Lestropie]

Hi @Remi-Gau,

Just bundling these together so that they all go to master in a single merge commit, there's a clean visible diff across the lot, and any relevant discussions are centralized.

I Don't get much time to play with this, even in functionality let alone surrounding software engineering, so appreciate the updates. Will give it a go when I get the chance.

Rob