Miscellaneous commits to add to next

Misc commits to add to next
Is this supposed to be `self.image` like the rest of these are?