Merge in fixes for rpm.