Try fixing compilation

Change-Id: Ie04230bd6dac7122408fe36c45330d23235e4abf