Correct merging/calculating properties