Some minor tweaks...