Fixes to work in EL6