Miscellaneous commits to add to next

Misc commits to add to next
good catch, I'll add this to the PR.