Fix various warnings

Change-Id: I78aa55539c2a3e522736bb178ba7d445300bf1f0