Changes for el7