Tweaks for RedHat support