co-signing both of these. maybe not high priority fixes, but they'd be very much appreciated nonetheless