Reliability tweaks