fix some more warnings

Change-Id: Ibae5a091f02c15ea6fc047f01e3a9be47e1cbaf1
fix some more warnings

Change-Id: Ibd35dfbd8d21170007e87094b67e551379556e45