Fixed ports and swaraj's curInfo problem (again, because Zack didn't
pull upstream)