Conneg perf

Minor tweaks to conneg perf