Experiments with cloud sizing
Fixed missing refs from separation of cloud code