APK export errors fixes.