Work around double call to init/free in F2.5
Merge branch 'fusion-2.5-fixes'