New minor tweaks