Collapse fixes