Fix CBS issues on android

Helix fix broke android, should also be quicker now.