Build fixes

With that batch of fixes, the build of the RPM package seems to go well, and it's very clean.