acu186787 More fixes for various clouds