Fixed bugs for fdroid build