Various tweaks to make crazy noise less likely.