Some tweaks for r38116: