#2123, #2106, #2561 RPM fixes

Feel free to squash into one for merge.