Astrid McCollom fix-conservatory-leaks4433