More leak fixing