Small Bugfixes and FDROID Support
