Metadata fixes [ci skip]