Fixes/Lint/APK