CORE-1848 still tweaking values