Several minor changes/bugfixes
Merge branch 'master' of https://github.com/Borderloop/Nutella