apk generation small fixes