Minor changes before commit to official AliROOT repository