Fixed compile warnings

(cherry picked from commit 5c27f464f78235d70414661721470e8213624f5f)