One small memory leak to go...