More various tweaks / fixes

:point_down: