Merge "Fix pointers pilfered when they shouldn't be" into main