Thanks ! I think I fixed some of them. The difficulty is that they both have bus relations on them, which need to move to the "final" way. Let me know if there is an easy way to do that, so far it's quite cumbersome.