Fix compilation issues

Change-Id: I9a49f1a612239cb78b5f1adba72819315aabd256