Fix some compile errors

Change-Id: I8d2a9b94f28ccfaa794a4385e5edd55865f81c31