Fixed remaining leaks in ONEWAY