apply fixes implemented in bit-android