scaffolding fixes for non sitetree objects