Merge "Fix compute ports"