Remove warnings

Change-Id: I10bbec104d69f69a8299e16a05b48b715efda077