Fixes to RPM building