More minor tweaking.