Fix EL7 issues

Should fix EL7 issue including the Travis error the previous pull request ran into.