Small fixes to RPM module