Bugfixes and updates for DHCP