Fixed port assignments to match the standard