Final small tunings
requested review from @edvargh
assigned to @tamml
approved this merge request
mentioned in commit aca4f817
merged
