Latest upstream updates

I'll merge this once I've tested they're all working.