Fixed some bugs that led to issues during primitive migration (for macro-cells)

Nils Kohlrequested to merge
fixing-primitive-migration into master

Merge request reports