DHCP builds and migration fixes (finally)