Fixes of @arnehormann's Code review