general: various smaller fixes
3 files changed