- Minor changes to minimize leaks