fixes for cloud support.