Fix compilation issues

Change-Id: I0f1bef2ff96a7989a3524af57f3f3064e4cd3c25