I've been asked by Triss to let you know that this patch seems to have fixed all the issues with structures not being rebuilt correctly (missing machines). Unfortunately each of them still needs manual intervention of him to be fixed.
If you can find structures without machines, please post here the coordinates.
Take care,
Luca