More RPM building fixes