Fix various things

Closed username-removed-124398 requested to merge NicoAlt/fdroid-website:master into master