Additional RHEL bugfixes