Final merge process fixes, leaks plugged
Annoying merging