Fixed Ellytree's screw-ups