Fix moar leeks

More low-hanging leek fixes.