Add flags to prevent compile errors

Change-Id: I34d7cfffdc4224abbc7ed947d956d64a024889ee