Final set of fixes for the unified RPM.