More mods to suit ROOT head