Fixes for std:: need with the trunk of Root (Jochen, Yves)