Merge back from develop

Ah, actual fixes. I hope.