More leak fixes, not 100% yet
Merge branch 'dev_LA' into dev