More work on the space leaks