Latest changes for the RPM build