Fix ports and properties stuff