more rhel5-compat clean-up