Two more changes helping with EPEL 7

This is related to https://fedorahosted.org/bodhi/ticket/758