Fix ROOT compilation

SVN r608737, r607108, r608736, r607109