From 2.6, cures compiler warnings.

Özkan Sezer