Several bugs - changes for RHEL7

Info for Jason - this bit was unused, so I am cleaning this up.