Tweaks for 790d3d4115a7a2645ed74c78d473cc479db78cc7