Fixes for 1192627, 1192626 and other issues with DHCP code