Fixup RPM according to house style