Final minor tweaks