Fix error in error tree initialization
More small fixes

Layout is still not set when in recovery, not sure why.