Misc bugfixes
More misc bugfixes
Merge branch '2.X-EXPERIMENTAL' of https://github.com/JustArchi/ArchiDroid into 2.X-EXPERIMENTAL