Latest minor tweaks