Small fixes to the RPM module