Fix issues with dakota client