Some minor tweeks.