More leak patching!

Almost there...