More and more minor tweaks