lonvia Merge pull request #2045 from joto/small-cleanups