Fix declaration tree