Some tweaks to the metadata joiner population needed