Some more minor tweaks