More minor tweaks...