RPM packaging fixes