more RPM fixes