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