A few small improvements to MC.net support fix (save a couple page loads, check for errors better)