Fix metadata handling at Site