Various RPM adjustments for defined features

Based on feedback at GRIF, a few adjustments in proposed RPM list. Should be non controversial hopefully...