Tweaks to work on CentOs 5.9