Fixes for DHCP config generation