Tweaks for testing clean.