Fix tree debugging aids