Fix compilations issues