Some minor tweaks