Fixes due to the introduction of the Property object in metadata.