fixes for cloud deployment problems