Miscellaneous commits to add to next

Misc commits to add to next
Cool, assumed so, but thought I should check :smile: