Fixes for android and new apk