Fix compilations issues in master