Compilation fixes

Change-Id: Ifc2c33d5f9c4c4f94511ba46ab3208a874968221
2 files changed