Small collapse/expand fixes