General collapsible fixes

See #2021