Improve el6 support