Fixes to get the analysis tree to show some basic data