More EFL build fixes.