Various small changes from DynamoCoreSplit

### Reviewers

- [ ] @lukechurch