Fixes for rpm-based distro builds