More minor tweaking