Fix cloud_wrapper