Made things less leaky