Fix port annotations