Cloud settings prep and protocol fixes.