Tweak some thresholds a little