MNT: Fixes based on metadatastore refactor