Warning and error fix.

(cherry picked from commit 9eb5a29d7c6d6430fb70a76f19b9a0e6d259da62)