More updates to make metadata handling consistent.