[WIP][BUGFIX] different smaller bugfixes

__Tasks:__
- [x] done
- [ ] todo
- [ ] got feedback

__Informations:__

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| Tests pass?   | yes
| Fixed tickets | none
| Doc           | none