Fixing a couple of bugs with dhcp