more fixes for rhel7