Fix F-Droid build issues
