fixing issues towards-1.1.7

[Mark Struberg]

gonna review our tickets and likely try to fix low hanging fruits in the 
evening.Any help is welcome!
After that I'd love to run a 1.1.7 release in the next days.

LieGrue,strub