Port reracking hotfixes