fixes for rhel7
cleanup