Further fixes to RPM.