Update RPM architecture and minor other updates