fixes to enable to use with RHEL-6