Fixed a few bugs with the help of the F-Droid team.
