Fixed more multiple-leaf problems