#478: Almost forgot - Metadata setting refs