Fixing some conflicts from T61