Fix important bugs

Collection of bugs

(from redmine: issue id 193, created on 2018-01-22tgradl, closed on 2018-01-22)