Upstream dhcp fixes