Fixed a regression from ticket #474
- Added some small fixes from different issues
Authored by: numere 2020-11-12
Parent: [r788]
Child: [r790]