Fixing dhcp bugs