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

25 jobs for fixing-primitive-migration in 117 minutes and 9 seconds (queued for 11 minutes and 47 seconds)