Few minor fixes, doesn't fail at 59% anymore, but fails at 93%
Merge branch 'master' of https://github.com/Amzo/ArchBSD