Fixes/APK