Fix some ZCLOUD issue