Fix compilation issues

Change-Id: I0966b7cec45c53f8818118d78bf480d2727595a6