minor fixes to dhcp flow