Additional fixes for RPM.