Tuning auto-parameter selection a bit