Changes to fix compile error of last version.

Arthur