Fix issues with collapse/expand on the Mac