Treemap fixes