Robert Downey Jr. and metadata fixes.