Minor hierarchy edits