Fix build errors and memory leaks

WXbetrequested to merge
fix-11832-11833 into master

introduced in 88d9daaa + 1d8753ec

Merge request reports