Remove warnings

Change-Id: I57c9b494ea9930d6713768ce39daaeafb13204c7