Fix: MultiLocation leak

And some other minor improvements.