Fix some expanding issues that were breaking compile with BaseCMChannel
Fix some expanding issues that were breaking compile with BaseCMChannel

cloudmine/cloudmine-android,cloudmine/cloudmine-android,ethanmick/cloudmine-android,ethanmick/cloudmine-android