Fix apk optimisation