Little changes to make it work with new base class.

No match.