Merge "Fix ports and attributes"