More minor tweaks