Finish up changes to ConsulAgent