Fixed a couple of compiling warnings when the "deep" analyzer is on. Change-Id: I96842e8226f1993a1329217c0dbf4a081d0c94f9