Getting rid of warnings

Change-Id: I2fb2db2ef531acef1b4d3fd47c3a9c6328708192