Align and improve Portmapping versions Step 2