fix trivial issues #2

Closed
conao3 wants to merge 3 commits from feature into master
Showing only changes of commit b781990890 - Show all commits