Remove some warnings

(cherry picked from commit 3e97c1c1cc9cf0de56c7f3fdbcf9651ddc0c341c)