Fix metadata handling