Fix under-retention (related to 5636606)
Correct variable name in script
Fix harmless compiler warning in Octree