Minimal changes here und there

Doesn't worth documenting it, too trivial