Fix leaks that valgrind found

Change-Id: I1a3918991fc5db1f6241309eacfc354a7f303e16
Merge topic 'fix_windblade_memleaks' into master

f1d8aeea Fix leaks that valgrind found