more tweaks to get manual port mapping prompt working #1655