Fixes in order to avoid compilation problems.

No match.