Few more fixes for the DHCP rpc calls