Various Risk fixes and deploy command.