Tweaks for first-phase of .org/.net merge