More DHCPv4 fixes